Merge git://git.denx.de/u-boot-rockchip
authorTom Rini <[email protected]>
Wed, 2 Nov 2016 13:41:20 +0000 (09:41 -0400)
committerTom Rini <[email protected]>
Wed, 2 Nov 2016 13:41:20 +0000 (09:41 -0400)

Trivial merge